Use g_object_ref/unref instead of deprecated specializations

diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index f97af80f9f7b33698dcf434e65ec8cb93f69aede..52ab3fbb814f7a617ae6005a87dfc8b980b9e34e 100644 (file)
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -214,10 +214,10 @@ gdk_win32_set_colormap (GdkDrawable *drawable,
     return;
   
   if (impl->colormap)
-    gdk_colormap_unref (impl->colormap);
+    g_object_unref (impl->colormap);
   impl->colormap = colormap;
   if (impl->colormap)
-    gdk_colormap_ref (impl->colormap);
+    g_object_ref (impl->colormap);
 }
 
 /* Drawing
@@ -494,7 +494,7 @@ draw_tiles (GdkDrawable *drawable,
 
   gdk_win32_hdc_release (drawable, gc, mask);
   gdk_win32_hdc_release (tile, gc_copy, mask);
-  gdk_gc_unref (gc_copy);
+  g_object_unref (gc_copy);
 }
 
 static void
@@ -629,11 +629,11 @@ generic_draw (GdkDrawable    *drawable,
              gdk_draw_rectangle (tile_pixmap, tile_gc, TRUE,
                                  0, 0, width, height);
            }
-         gdk_gc_unref (stipple_gc);
+         g_object_unref (stipple_gc);
        }
 
-      gdk_gc_unref (mask_gc);
-      gdk_gc_unref (tile_gc);
+      g_object_unref (mask_gc);
+      g_object_unref (tile_gc);
 
       mask_hdc = CreateCompatibleDC (hdc);
 

diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c
index 9a5aaf582c76868edf2d9e5079f4f82969cd4b8d..4359183b9b79fa9cfae8a89569981827c2aee62f 100644 (file)
--- a/gdk/win32/gdkimage-win32.c
+++ b/gdk/win32/gdkimage-win32.c
@@ -266,7 +266,7 @@ _gdk_win32_copy_to_image (GdkDrawable    *drawable,
     (FALSE,
      GDK_DRAWABLE_IMPL_WIN32 (GDK_PIXMAP_OBJECT (image->windowing_data)->impl),
      gc, drawable, src_x, src_y, dest_x, dest_y, width, height);
-  gdk_gc_unref (gc);
+  g_object_unref (gc);
 
   return image;
 }
@@ -392,7 +392,7 @@ gdk_win32_image_destroy (GdkImage *image)
   GDK_NOTE (IMAGE, g_print ("gdk_win32_image_destroy: %p\n",
                            GDK_PIXMAP_HBITMAP (pixmap)));
 
-  gdk_pixmap_unref (pixmap);
+  g_object_unref (pixmap);
   image->windowing_data = NULL;
 }
 

diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c
index 860bff20cc3d55f25e335ebf8df3c2628d3515ea..d231cbd106fc30c333f482085a27ca984be49904 100644 (file)
--- a/gdk/win32/gdkpixmap-win32.c
+++ b/gdk/win32/gdkpixmap-win32.c
@@ -428,7 +428,7 @@ _gdk_pixmap_create_from_data (GdkDrawable    *drawable,
      GDK_DRAWABLE_IMPL_WIN32 (GDK_PIXMAP_OBJECT (result)->impl),
      gc, source, 0, 0, 0, 0, width, height);
   g_object_unref (source);
-  gdk_gc_unref (gc);
+  g_object_unref (gc);
 
   GDK_NOTE (PIXMAP, g_print ("gdk_pixmap_create_from_data: %dx%dx%d=%p\n",
                             width, height, depth,